

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<script type="text/javascript" src="helpman_topicinit.js"></script>

<title>Baselines, Differencing and Merges [Enterprise Architect User Guide]</title>

<meta name="keywords" content="Enterprise Architect, Sparx Systems, UML, Baseline,Baseline And Differences, Overview,Baseline Merge With Current Model, Overview,Compare,Compare Utility,Diff Utility,Utility,Utility Compare,Utility Diff,Merge,Merge Baseline With Current Model, Overview,Auditing,Auditing Alternative To Differencing">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<meta http-equiv="Content-Style-Type" content="text/css" />

<link type="text/css" href="default.css" rel="stylesheet" />
<style type="text/css">
  A, A:Visited
  {
    color: #00F;
  }

  A:Active, A:Hover
  {
    color: #F00;
  }

  OL
  {
    margin: 5px 0 5px 48px;
  }

  UL
  {
    margin-bottom: 3px;
    margin-top: 0;
  }

  #nsr
  {
    background-color: #D4DFFF;
  }

  #nsr A
  {
    text-decoration: none;
  }

  #mainbody
  {
    padding: 8px;
  }

  .p_BodyText
  {
    padding: 5px 0;
  }
</style>



<style type="text/css" media="screen">
  BODY
  {
    background-color: #FFFFFF;
  }

  #nsr
  {
    padding: 6px 6px 0 6px;
    border-bottom: none;
    vertical-align: top;
    z-index: 2;
    visibility: visible;
    left: 0;
    top: 0;
    position: absolute;
  }

  #mainbody
  {
    left: 0;
    top: 0;
    margin: 0;
    position: absolute;
    padding: 10px;
    overflow: auto;
    height: 100%;
    z-index: 1;
    background-repeat: no-repeat;
    background-position: bottom right;
    background-attachment: fixed;
  }
</style>

<style type="text/css" media="print">
  #nsr
  {
    visibility: none;
  }

  #mainbody
  {
    overflow: visible;
  }
</style>
<script type="text/javascript" language="JavaScript" src="nonscroll.js"></script>

</head>
<body scroll="no">

<div id="page">



        <div id="content">
          <div id="content-inner">
          



  
          <div id="nsr">
            <table border="0" cellspacing="0" cellpadding="4" width="100%">
              <tr valign="top">
                <td align="left">
  


                  <p class="p_Heading1"><span class="f_Heading1">Baselines, Differencing and Merges</span></p>



  
                </td>
                <td align="right">
                  <a href="introduction.htm" onmouseover="document.images.main.src='button_main_h.gif'" onmouseout="document.images.main.src='button_main.gif'">
                    <img name="main" src="button_main.gif" border=0 alt="Return to Introduction">
                  </a>&nbsp;
    
                  <a href="offline_version_control.htm" onmouseover="document.images.prev.src='button_prev_h.gif'" onmouseout="document.images.prev.src='button_prev.gif'">
                    <img name=prev src="button_prev.gif" border=0 alt="Previous page" />
                  </a>&nbsp;
    
    
    
                  <a href="baselines.htm" onmouseover="document.images.next.src='button_next_h.gif'" onmouseout="document.images.next.src='button_next.gif'">
                    <img name=next src="button_next.gif" border=0 alt="Next page" />
                  </a>
    
    
                </td>
              </tr>
            </table>
          </div>
          <div id="mainbody">
  


                <p class="p_TextIndentedL1"><img src="baselines_differencing_and_merges.png" width="235" height="100" border="0" alt="baselines_differencing_and_merges"></p>
<p class="p_BodyText"><span class="f_BodyText">Enterprise Architect (</span><span class="f_BodyText">Corporate, Business and Software Engineering, System Engineering and Ultimate editions</span><span class="f_BodyText">) includes tools to help you manage and review changes to your models over time. These tools apply the concepts of </span><span class="f_BodyText" style="font-style: italic;">Baselines</span><span class="f_BodyText">, </span><span class="f_BodyText" style="font-style: italic;">Differencing</span><span class="f_BodyText"> and </span><span class="f_BodyText" style="font-style: italic;">Merges</span><span class="f_BodyText">.</span></p>
<p class="p_BodyText"><span class="f_BodyText">You can also obtain a snapshot of selected items in the model, using the <a href="model_views.htm">Model View</a> facility. In the Corporate, Business and Software Engineering, Systems Engineering or Ultimate editions of Enterprise Architect, this facility enables you to automatically generate this snapshot at intervals and, if there are changes in the items collected by the defined search, to trigger a notification to you of such changes. This enables you to <a href="monitor_events.htm">monitor work flow</a> and other events of concern to you.</span></p>
<p class="p_SubHeadingL1"><span class="f_SubHeadingL1">Baselines</span></p>
<p class="p_BodyText"><span class="f_BodyText">Enterprise Architect (</span><span class="f_BodyText">Corporate, Business and Software Engineering, System Engineering and Ultimate editions</span><span class="f_BodyText">) provides a facility to create a <a href="baselines.htm">Baseline</a> or snapshot of the contents of a selected package and its child packages at a particular point in time, enabling you to later compare that branch of the model at that time with the current state of the branch. Baselines are stored in the same XML format as is used for version control, but are stored </span><span class="f_BodyText" style="font-style: italic;">within</span><span class="f_BodyText"> the project in compressed format. You can also have parallel copies of parts of your model for team development, and create Baselines within each copy to merge changes into the project master.</span></p>
<p class="p_SubHeadingL1"><span class="f_SubHeadingL1">Differencing</span></p>
<p class="p_BodyText"><span class="f_BodyText">Differencing (</span><span class="f_BodyText" style="font-style: italic;">Diff</span><span class="f_BodyText">, or </span><span class="f_BodyText" style="font-style: italic;"><a href="differences.htm">Compare</a></span><span class="f_BodyText">) enables you to explore the differences between the current state of a specific part of your project, and previous or parallel versions captured in a Baseline or an XML file on disk.</span></p>
<p class="p_SubHeadingL1"><span class="f_SubHeadingL1">Merges</span></p>
<p class="p_BodyText"><span class="f_BodyText">Once Differencing is complete, you can merge information from the Baseline into the current project; it is not possible to go the other way. You can merge information manually, change by change, or automatically by electing to merge in all changes in one batch procedure. You can also revert completely to the original Baseline by importing the stored XMI directly, and merge in information and elements from a Baseline in a different project, making it possible to keep multiple versions of a single model in synch.</span></p>
<div style="text-align: left; text-indent: 0px; padding: 0px 0px 0px 0px; margin: 5px 0px 5px 13px;"><table cellspacing="0" cellpadding="2" border="0" style="border: none; border-spacing:0px;">
<tr style="text-align:left;vertical-align:bottom;">
<td valign="bottom" width="955" bgcolor="#efeff7" style="width:955px; background-color:#efeff7;"><p class="p_TiporNote" style="border-top: none; border-right: none; border-left: none;"><span class="f_TiporNote">Notes:</span></p>
</td>
</tr>
<tr style="text-align:left;">
<td width="955" bgcolor="#f7f7ff" style="width:955px; background-color:#f7f7ff;"><ul style="text-indent: 0px; margin-left: 14px; list-style-position: outside;">
<li><span class="f_TiporNoteText">You use Baselines, Differencing and Merges essentially to compare two snapshots of a specific part of your project, to capture the differences between them and either roll back or incorporate selected changes or all changes. Enterprise Architect </span><span class="f_TiporNoteText">Corporate, Business and Software Engineering, System Engineering and Ultimate editions</span><span class="f_TiporNoteText"> have another facility, <a href="auditing.htm">Auditing</a>, which you can switch on to perform continuous monitoring of changes across the project. You can dovetail your use of each facility to meet the range of your change management requirements.</span></li>
<li><span class="f_TiporNoteText">If a package under version control forms part of a Baseline, and that package is checked in to the model, you cannot merge the original data from the Baseline into that package.</span></li>
<li><span class="f_TiporNoteText">If security is enabled you must have </span><span class="f_TiporNoteText" style="font-weight: bold;"><a href="permissionlist.htm">Manage Baselines</a></span><span class="f_TiporNoteText"> permission to create, import and delete Baselines, and </span><span class="f_TiporNoteText" style="font-weight: bold;">Restore From Baseline</span><span class="f_TiporNoteText"> permission to merge data from a Baseline. Security permissions are not required to select an existing Baseline and perform a comparison with the model.</span></li>
</ul>
</td>
</tr>
</table>
</div>




            </div>
          </div>
        </div>



</div>


</body>
</html>
